From 18bec8700a62ddb306dc4d66355b5f6775d26abe Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sat, 10 Jul 2004 23:14:14 +0000 Subject: [PATCH] Bug 144371 Sun Jul 11 01:12:50 2004 Soeren Sandmann Bug 144371 * gtk/gtknotebook.c (gtk_notebook_size_allocate): Remove an unnecessary redraw.. * gtk/gtknotebook.c (gtk_notebook_page_allocate): Remove some incorrect redraws. --- ChangeLog | 10 +++++++++ ChangeLog.pre-2-10 | 10 +++++++++ ChangeLog.pre-2-6 | 10 +++++++++ ChangeLog.pre-2-8 | 10 +++++++++ gtk/gtknotebook.c | 52 ---------------------------------------------- 5 files changed, 40 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d0cab15b6..5ba3c8676f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sun Jul 11 01:12:50 2004 Soeren Sandmann + + Bug 144371 + + * gtk/gtknotebook.c (gtk_notebook_size_allocate): Remove an + unnecessary redraw.. + + * gtk/gtknotebook.c (gtk_notebook_page_allocate): Remove some + incorrect redraws. + Sat Jul 10 01:33:25 2004 Matthias Clasen * docs/RELEASE-HOWTO: Updates. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1d0cab15b6..5ba3c8676f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Sun Jul 11 01:12:50 2004 Soeren Sandmann + + Bug 144371 + + * gtk/gtknotebook.c (gtk_notebook_size_allocate): Remove an + unnecessary redraw.. + + * gtk/gtknotebook.c (gtk_notebook_page_allocate): Remove some + incorrect redraws. + Sat Jul 10 01:33:25 2004 Matthias Clasen * docs/RELEASE-HOWTO: Updates. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1d0cab15b6..5ba3c8676f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Sun Jul 11 01:12:50 2004 Soeren Sandmann + + Bug 144371 + + * gtk/gtknotebook.c (gtk_notebook_size_allocate): Remove an + unnecessary redraw.. + + * gtk/gtknotebook.c (gtk_notebook_page_allocate): Remove some + incorrect redraws. + Sat Jul 10 01:33:25 2004 Matthias Clasen * docs/RELEASE-HOWTO: Updates. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1d0cab15b6..5ba3c8676f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Sun Jul 11 01:12:50 2004 Soeren Sandmann + + Bug 144371 + + * gtk/gtknotebook.c (gtk_notebook_size_allocate): Remove an + unnecessary redraw.. + + * gtk/gtknotebook.c (gtk_notebook_page_allocate): Remove some + incorrect redraws. + Sat Jul 10 01:33:25 2004 Matthias Clasen * docs/RELEASE-HOWTO: Updates. diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index e44f56e8c4..751c0ae0b3 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -1513,13 +1513,6 @@ gtk_notebook_size_allocate (GtkWidget *widget, gtk_notebook_pages_allocate (notebook); } - - if ((vis_pages != 0) != notebook->have_visible_child) - { - notebook->have_visible_child = (vis_pages != 0); - if (notebook->show_tabs) - gtk_widget_queue_draw (widget); - } } static gint @@ -3588,51 +3581,6 @@ gtk_notebook_page_allocate (GtkNotebook *notebook, xthickness = widget->style->xthickness; ythickness = widget->style->ythickness; - /* If the size of the notebook tabs change, we need to queue - * a redraw on the tab area - */ - if ((allocation->width != page->allocation.width) || - (allocation->height != page->allocation.height)) - { - gint x, y, width, height, border_width; - - border_width = GTK_CONTAINER (notebook)->border_width; - - switch (tab_pos) - { - case GTK_POS_TOP: - width = widget->allocation.width; - height = MAX (page->allocation.height, allocation->height) + ythickness; - x = 0; - y = border_width; - break; - - case GTK_POS_BOTTOM: - width = widget->allocation.width + xthickness; - height = MAX (page->allocation.height, allocation->height) + ythickness; - x = 0; - y = widget->allocation.height - height - border_width; - break; - - case GTK_POS_LEFT: - width = MAX (page->allocation.width, allocation->width) + xthickness; - height = widget->allocation.height; - x = border_width; - y = 0; - break; - - case GTK_POS_RIGHT: - default: /* quiet gcc */ - width = MAX (page->allocation.width, allocation->width) + xthickness; - height = widget->allocation.height; - x = widget->allocation.width - width - border_width; - y = 0; - break; - } - - gtk_widget_queue_draw_area (widget, x, y, width, height); - } - page->allocation = *allocation; gtk_widget_get_child_requisition (page->tab_label, &tab_requisition); -- 2.30.2